From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 21 Feb 2013 04:37:54 +0000 (-0500)
Subject: messageTray: Fix warning when opening the tray
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4665
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7b06d34ba43ce7355d586e801066b839ef55c1c9;p=gnome-shell.git

messageTray: Fix warning when opening the tray

As the tray hover handler will call _cancelTrayDwell, we need to
ensure this variable is initialized even if tray dwelling isn't.

https://bugzilla.gnome.org/show_bug.cgi?id=694336
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 308b223e8..2deb9fe60 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1754,12 +1754,13 @@ const MessageTray = new Lang.Class({
     },
 
     _setupTrayDwellIfNeeded: function() {
+        this._trayDwellTimeoutId = 0;
+
         // If we don't have extended barrier features, then we need
         // to support the old tray dwelling mechanism.
         if (!global.display.supports_extended_barriers()) {
             let pointerWatcher = PointerWatcher.getPointerWatcher();
             pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
-            this._trayDwellTimeoutId = 0;
             this._trayDwelling = false;
             this._trayDwellUserTime = 0;
         }